From: Boyuan Yang Date: Fri, 26 Jun 2020 00:31:12 +0000 (-0400) Subject: fix patches X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~102 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=e63d5cf9da75728b63ffc2e51f88362b819ad515;p=opencc.git fix patches --- diff --git a/debian/patches/0003-data-Explicitly-use-python3.patch b/debian/patches/0003-data-Explicitly-use-python3.patch new file mode 100644 index 0000000..2388a8d --- /dev/null +++ b/debian/patches/0003-data-Explicitly-use-python3.patch @@ -0,0 +1,65 @@ +From: Boyuan Yang +Date: Thu, 25 Jun 2020 20:32:44 -0400 +Subject: data/: Explicitly use python3 + +Before "python" is default to python3, this patch should be kept. + +Last-Update: 2020-06-25 +--- + data/scripts/find_target.py | 2 +- + data/scripts/merge.py | 2 +- + data/scripts/reverse.py | 2 +- + data/scripts/sort.py | 2 +- + data/scripts/sort_all.py | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/scripts/find_target.py b/data/scripts/find_target.py +index 4244949..7b2b477 100755 +--- a/data/scripts/find_target.py ++++ b/data/scripts/find_target.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + import sys +diff --git a/data/scripts/merge.py b/data/scripts/merge.py +index 680c90e..01fcf51 100755 +--- a/data/scripts/merge.py ++++ b/data/scripts/merge.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + import codecs +diff --git a/data/scripts/reverse.py b/data/scripts/reverse.py +index 746f887..a87ae46 100755 +--- a/data/scripts/reverse.py ++++ b/data/scripts/reverse.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + import sys +diff --git a/data/scripts/sort.py b/data/scripts/sort.py +index f7d4dc5..6ad6e8c 100755 +--- a/data/scripts/sort.py ++++ b/data/scripts/sort.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + import sys + +diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py +index 20d82fd..11bc4c9 100755 +--- a/data/scripts/sort_all.py ++++ b/data/scripts/sort_all.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + import glob + import sys diff --git a/debian/patches/0004-data-Explicitly-use-python3.patch b/debian/patches/0004-data-Explicitly-use-python3.patch deleted file mode 100644 index c5d991d..0000000 --- a/debian/patches/0004-data-Explicitly-use-python3.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Boyuan Yang -Date: Mon, 13 Apr 2020 18:18:19 -0400 -Subject: data/: Explicitly use python3 - -Before "python" is default to python3, this patch should be kept. - -Last-Update: 2020-04-13 ---- - data/scripts/find_target.py | 2 +- - data/scripts/merge.py | 2 +- - data/scripts/reverse.py | 2 +- - data/scripts/sort.py | 2 +- - data/scripts/sort_all.py | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/scripts/find_target.py b/data/scripts/find_target.py -index 28ada27..ffb3704 100755 ---- a/data/scripts/find_target.py -+++ b/data/scripts/find_target.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #coding: utf-8 - import sys - from common import find_target_items -diff --git a/data/scripts/merge.py b/data/scripts/merge.py -index 170bf60..4200b8b 100755 ---- a/data/scripts/merge.py -+++ b/data/scripts/merge.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #coding: utf-8 - import codecs - import sys -diff --git a/data/scripts/reverse.py b/data/scripts/reverse.py -index f702460..2a47a9e 100755 ---- a/data/scripts/reverse.py -+++ b/data/scripts/reverse.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #coding: utf-8 - import sys - from common import reverse_items -diff --git a/data/scripts/sort.py b/data/scripts/sort.py -index 8268bde..1585ccb 100755 ---- a/data/scripts/sort.py -+++ b/data/scripts/sort.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #coding: utf-8 - import sys - from common import sort_items -diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py -index 0cecdaa..2cad6f9 100755 ---- a/data/scripts/sort_all.py -+++ b/data/scripts/sort_all.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #coding: utf-8 - import glob - import sys diff --git a/debian/patches/series b/debian/patches/series index 9f0877f..1528142 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ use-cmake-install-libdir.patch 0003-use-system-libraries.patch -0004-data-Explicitly-use-python3.patch +0003-data-Explicitly-use-python3.patch diff --git a/debian/patches/use-cmake-install-libdir.patch b/debian/patches/use-cmake-install-libdir.patch index 9677493..11be2e9 100644 --- a/debian/patches/use-cmake-install-libdir.patch +++ b/debian/patches/use-cmake-install-libdir.patch @@ -8,10 +8,10 @@ Subject: use-cmake-install-libdir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05fff42..876bfb1 100644 +index 08d186a..efb51ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) +@@ -74,7 +74,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) set (DIR_INCLUDE ${DIR_PREFIX}/include/) set (DIR_SHARE ${DIR_PREFIX}/share/) set (DIR_ETC ${DIR_PREFIX}/etc/)